merge trunk
authorKenichi Handa <handa@gnu.org>
Thu, 8 Nov 2012 11:25:33 +0000 (20:25 +0900)
committerKenichi Handa <handa@gnu.org>
Thu, 8 Nov 2012 11:25:33 +0000 (20:25 +0900)

Trivial merge